Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Textures for mercenary things #620

Merged
merged 6 commits into from
Dec 10, 2023
Merged

Textures for mercenary things #620

merged 6 commits into from
Dec 10, 2023

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Nov 28, 2023 •
edited
Loading

About the PR

Made textures for a bunch of mercenary things:

  • Locker and Airlocks (Standard and Glass);
  • PDA, ID, Job Icon;
  • Duffel, Satchel, Jumpskirt, Headset;
  • Hardsuit with Headpiece, Magboots.

But I don't know how to make actual items, so this PR contains textures only.

Why / Balance

Uhh..

Media

Locker:
mercenary mercenary_door mercenary_open

Airlocks:
opening
opening

Icons for items (showing only icons so not to clutter PR too much):
icon icon icon icon
icon icon icon-on pda-mercenary

  • I have added screenshots/videos to this PR showcasing its changes

Changelog
🆑 erhardsteinhauer

  • add: Textures for Mercenary related objects: locker, airlocks, missing clothing (duffel, satchel, jumpskirt), PDA/ID/Job Icon, headset, hardsuit with headpiece.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 28, 2023 •
edited
Loading

RSI Diff Bot; head commit c0ab93b merging into ea97b48
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Back/Duffels/mercenary.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Back/Satchels/mercenary.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Ears/mercenary.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vulpkanin Added
off-equipped-HELMET Added
off-inhand-left Added
off-inhand-right Added
on-equipped-HELMET-vulpkanin Added
on-equipped-HELMET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-mercenary.rsi

State Old New Status
equipped-FEET Added
icon-on Added
icon Added
inhand-left Added
inhand-right Added
on-equipped-FEET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Doors/Airlocks/Glass/mercenary.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/_NF/Doors/Airlocks/Standard/mercenary.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/_NF/Interface/Misc/job_icons.rsi

State Old New Status
Mercenary Added

Resources/Textures/_NF/Objects/Devices/pda.rsi

State Old New Status
equipped-BELT Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda-mercenary Added

Resources/Textures/_NF/Objects/Misc/id_cards.rsi

State Old New Status
default Added
idmercenary Added

Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/mercenary.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/mercenary.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/_NF/Structures/Storage/closet.rsi

State Old New Status
mercenary Added
mercenary_door Added
mercenary_open Added

Edit: diff updated after c0ab93b

@ErhardSteinhauer ErhardSteinhauer changed the title Textures for mercenary locker, mercenary airlocks Textures for mercenary things Nov 29, 2023
@dvir001 dvir001 mentioned this pull request Nov 29, 2023
Merged
1 task
Cheackraze
Cheackraze requested changes Dec 1, 2023
View reviewed changes
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other than the extra file, it seems like you've forgotten to add meta.json files to some of these texture folders

Resources/Textures/_NF/Clothing/Back/Duffels/mercenary.rsi/merc-inhand-left.xcf Outdated Show resolved Hide resolved
@Cheackraze
Copy link
Member

the RSI validator says some of your meta files are incorrect still on these

@ErhardSteinhauer
Copy link
Contributor Author

I'll look into it

@ErhardSteinhauer
Copy link
Contributor Author

Alright, I think I fixed issues with meta.json files flagged by RSI validator

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 5, 2023
@Cheackraze Cheackraze merged commit 7c92dc4 into new-frontiers-14:master Dec 10, 2023
11 checks passed
FrontierATC added a commit that referenced this pull request Dec 10, 2023
@FrontierATC
Automatic Changelog (#620)
f290021
@ErhardSteinhauer ErhardSteinhauer deleted the Mercenary-Locker-n-Airlock branch January 31, 2024 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze approved these changes

Assignees
No one assigned
Labels
Status: Needs Review This PR is awaiting reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ErhardSteinhauer @Cheackraze